From 8543240ec93ccef6bc25a4720aeda8255b1f437d Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Fri, 7 Jan 2005 01:16:26 +0000 Subject: [PATCH] bitkeeper revision 1.1159.212.9 (41dde2eagwOCuLzt_7mdSFXqA992dg) VMX bug fixes - disable errant safety check. --- xen/arch/x86/domain.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index fc24337329..5d86fd34e5 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -363,9 +363,10 @@ int arch_final_setup_guestos(struct exec_domain *d, full_execution_context_t *c) * #GP. If DS, ES, FS, GS are DPL 0 then they'll be cleared automatically. * If SS RPL or DPL differs from CS RPL then we'll #GP. */ - if ( ((d->thread.user_ctxt.cs & 3) == 0) || - ((d->thread.user_ctxt.ss & 3) == 0) ) - return -EINVAL; + if (!(c->flags & ECF_VMX_GUEST)) + if ( ((d->thread.user_ctxt.cs & 3) == 0) || + ((d->thread.user_ctxt.ss & 3) == 0) ) + return -EINVAL; memcpy(&d->thread.i387, &c->fpu_ctxt, @@ -412,10 +413,8 @@ int arch_final_setup_guestos(struct exec_domain *d, full_execution_context_t *c) } } -#ifdef CONFIG_VMX if (c->flags & ECF_VMX_GUEST) return vmx_final_setup_guestos(d, c); -#endif return 0; } -- 2.30.2